Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[eloquent] Backports #1023 #1167 #1170

Merged
merged 2 commits into from
Jun 23, 2020
Merged

Conversation

ivanpauno
Copy link
Member

@ivanpauno ivanpauno commented Jun 11, 2020

This PR will be merged with --ff-only, to preserve commit hashes.
Backports #1023 #1167.

#1167 was modified, as #844 wasn't backported to eloquent.
I don't think it's a good idea to backport #844, as it introduces a behavior change that can affect some use cases (see discussion in #1156).

@ivanpauno ivanpauno requested a review from mjcarroll June 11, 2020 20:36
@ivanpauno ivanpauno self-assigned this Jun 11, 2020
DongheeYe and others added 2 commits June 22, 2020 16:55
Signed-off-by: Donghee Ye <donghee.ye@samsung.com>
Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
@ivanpauno ivanpauno force-pushed the ivanpauno/eloquent-#1023-#1167 branch from 9fdb9d7 to aeaf1ac Compare June 22, 2020 19:56
@ivanpauno
Copy link
Member Author

@mjcarroll friendly ping

@ivanpauno
Copy link
Member Author

The test failing in the PR checker is a known flaky test.

@mjcarroll mjcarroll merged commit 070ed29 into eloquent Jun 23, 2020
@mjcarroll mjcarroll deleted the ivanpauno/eloquent-#1023-#1167 branch June 26, 2020 15:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants